From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 22 Jun 2011 21:52:08 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~3359^2~11
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=ffd3134c876d261991c77c6d1ea7b8524a1af2d6;p=emacs.git

Merge from trunk.
---

ffd3134c876d261991c77c6d1ea7b8524a1af2d6